From d6ed97346da84912138c912102e1944d56234641 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 23 Aug 2021 18:29:09 +0100
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
---
 config_host.mk.in       |   1 +
 configure.ac            | Bin 513728 -> 513868 bytes
 solenv/gbuild/gbuild.mk |   2 ++
 3 files changed, 3 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index 8aafb03b0ae..5d835e768c0 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -92,6 +92,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
 export CPUNAME=@CPUNAME@
 export CDEFAULTOPT=@CDEFAULTOPT@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
 export CROSS_COMPILING=@CROSS_COMPILING@
 export CURL=@CURL@
 export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
diff --git a/configure.ac b/configure.ac
index af4575eccb73748d848fcddb1a1d65896624b63c..1216ee8c1f29104727338b584b615238aa5369ad 100644
GIT binary patch
delta 178
zcmX@GR{qR7`Gyw87N!>F7M2#)Eo?f8^_gi3C8@<F3c3{v`lZE1`bn92`Y8q3>AFd!
znK>zGIf?1T)(RyVsd-!q5a8h$<l^cV?;H@|=HuudY@2|lT0vJgJ+(vuCa+**r=OBq
wrk_`ulas)emdWMl93LF&6da-fHi#Etk|r0|^uJ5krQ6*T*|xhUvR9S@0FPri6aWAK

delta 36
scmX@JPX54J`Gyw87N!>F7M2#)Eo?f8(;HLRB-<}0vTeVZ$X;Cv00aUJ$^ZZW

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 08c82f5e8d1..ba5479de947 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -260,6 +260,8 @@ gb_GLOBALDEFS += \
 		DISABLE_DYNLOADING \
 	)
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # Common environment variables passed into all gb_*Test classes:
-- 
2.30.2